Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 29 Jun 2010 22:51:37 +0000 (22:51 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 29 Jun 2010 22:51:37 +0000 (22:51 +0000)

Trivial merge